CSS changes
Ajax changes
Reorganized files
Reorganized files
Resolved merge conflicts