Added messages, filtering, modals etc