Edited views, added ajax, some tests