Issue ajax calls finally streamlined
Few cleanup tweaks
Merge branch 'dev'