styling, ajax, resolved merge conflicts