More Ajax changes

A lot of ajax changes.

Signed-off-by: Artur Tenorio <arturvt@gmail.com>