UI & more states