Fixed bugs & add secured action