fixed stuff
fixed menu stuff