More changes to menu code
Small refactor
Small cosmetic changes
Added basic options menu