button shape change
merge conflicts
landing page is responsive