[BUG #8544] Change placement of menu
[BUG #8544] Fix unit tests