updated for UI clean up
Tool button tweaked
Main maxmise window tweaked