Add CSS and fix some bug