* UI fixes
* Taking admins into account