Simplyifly UI a little

fixes #53
fixes #63
fixes #64