More prototyping cleaned up UI