to push on monday
Merge branch 'msg_sidebar_styling' into testing