Working commit

Added menu button
Added state handling
Added question handling