Added rules, fixed public UI