Add null message, cleanup some SCSS