Added message container
Fixed linting