Rethought layout, responsive fixes