Manual BPM page
Merge branch 'manual-bpm' into sorah