Some tidying and section for bootstrap messages to be added