Comment 5 for bug 1013945

Created attachment 4431
also make appropriate canges to the UI and settings

Perhaps there are more changes to be made than I initially thought. Maybe this should be enough.