huge update to new layout and design