Added more messages to messages.yml
Organized more messages in lang class