Celaned up with CSS & Message bundle