more layout and style changes