#10 Improve menu structure
#11 Better usability