Menu fixes

Fixes bugs in tablet view