layout and stylesheet cleanup