Updated to include custom property editor for ScrollBars
Minor updates