Magic brush

UI changes, merging right away.

/cc @amitbharadwaj @fcduarte