code review
edit: admin, improving ui