Minor client side fixes
Rebuild
Merge branch 'feature/issue-125-minor-client-side-fixes' into develop