Front end, fix domain issues, tests
Merge branch 'presentation' into develop