Minor edits to code. Still need to fix bug with line hit test.

Added toolbarItem object for readability and ease in making changes.
Renamed currentMenuSelected to currentToolbarItem. Replaced if-else
ladder with switch statement in mousemove function.