many changes to layout and styles