design landing page
resolved merge conflicts