Added full screen support