And I noticed that the screen flashes when entering the menu. I think that should also need to be fixed before merging.