trying to fix messaging
fixed css
fixed css AGAIN
fixed even more merge conflicts
MERGE CONFLICTS
trying to fix notifications