UI update

Partial commit of progress made on UI