brush fixes and ui changes