Cleaned up the view and started working on the Cart