Fixes for the menues (not very clean, but it works)