Add CSS and other design issue