style changes
resolved merge conflict
add css styling/layout