Made layout code more readable