Layout changed to fit one screen