Issue 66 ui updates