Menu finished and some bug fixes
fix