clean up layout and html structure somewhat