Issue #264 - Move logic on whether to show actions from templates to controllers - continues