Improve volume widget, chg. wkspc order

Still need to clean up comments and volume widget customizations