WIP #882 Add more hooks v2

Fixes ACP hooks positions.