some styling
resolved merge conflicts
Merge pull request #26 from kiopelani/ariana

styling, ajax, resolved merge conflicts