cleaned code, moved menu icon to top