Fixed some messages
Fixed menu