Added hit tests for circle and rectangle. Added comments (incomplete).

Also adjusted header height so that canvas does not move when menu
changes.