Change layout; move to scss