Cosmetic changes to layout