Minor improvements regarding UI and code