Fixing menu, final i think