Cart button fixes, moved search to main page