Minor changes
Adding styles to messages
Minor fixes