Final changes on page

Now all ajax