Minor formatting in layout and style