Fixes and add basic menu