Align bug fixes on advocate page

Align bug fixes on advocate page