Changed form ui, querystring, new directives
Merged a lot of things