Cleaned up toolbars and editing