Added Full-screen support