activity_fullscreen cleanup, main controller fix