Added basic menu handling