Improved shopping cart
Finished preferences page
Clean ups