added menu, re organized control panel