some ui work, some time code consolidation