Updated UI with overwritten changes >:o STEPHEN :D
Merge branch 'issue14' into dev