10062014 midCommit

did some ui work