Fullscreen and template fixes