Added icons, UI niceties