some minor changes on the layout