Fixes

Fixed up menu system to be more modular, fixed camera issue where
coordinates were off by 1.