restricted working + UI fixes