Fixes #7 and refactored icons

Also cleaned up the menu with arrows and additional formatting.