Fixed some messages
Fixed menu
Fixes