First attempt at fixing layout