final bug fixes (one hopes)
Remove ajax as causing error
Merge branch 'chore/bug_fixes_and_styling' into dev