merged ui with authentication more cleanly