Menu and Cutscene improvements. Also some preparation for further State machine implementation