Fix redirect; Add actions; refactoring;