improved layout, some menu implemented