Styles modified, message and error properties added, refactors done