Menu fixes

Fixes bugs in tabletview