Move JS to end of body
Merge branch 'feature/ui'