Refactor message Sass and layout fiddling