UI improvements & fixed build error