moved some things in UI