Updated UI and fixed multi-screen size layouts