Css by Shawn, and fix code