Added menu + cleaned code up