Exception and CSS fix