various layout and style changes