Some layout and style changes