Refactor shiro ui classes