Various UI and code improvements - Amongst others, this closes #9