Cleanup

- Removed map stuff, will re-add later
- Added buttons for new features