[BUG #8544] Change placement of menu
(cherry picked from commit 7c16c8d6fea87cde58974ea282119702470c01e1)
[BUG #8544] Fix unit tests
(cherry picked from commit 6e5d2bc7c0275976d5c442197696a977f0497874)