further layout and style changes