Rework fullscreen view