stories and homepage view styles
resolved merge conflict