refactored the main content, have not refactored the shopping cart section