foreman top menu changes.

Do not merge before the corresponding foreman PR get merged!