Added base menu
Improved basic menu