ui cleanup, some ui additions