Cleaned up seperators and updated menus

Expanded menu to cover more items, cleaned up menu rendering