Cleaned up layouts for laptops/desktops