Updated GUI to handle full-screen better