modal, messages,sidebar,lots of fixes