Finish ajax tests
Add basic styling
Refactoring