Improving design, adding menu selection