Added wheelmenu.  Got core functionality working.
Cleaned up sidebar and UI conflict areas. Hooked up new marker mode and refactored it.
Fixed map conflict.
Fixed git screwup