Bug Fixed and CSS Added