Various changes including menu layout and overall styling.
Implemented draw circle and rectangle tools.