'Beautification' issues and adding a bit of UI polish; Closes #204