Fix broken things
Merge branch 'dev'
Integrate some pretty UI