layout and style fixing