Fixes

- Unintentional redirect is fixed
- Controllers cleaned a little