made a whole lot of changes to the layout and design based on peek report