Fixing templates + buttons + redirect views