Update

CSS and JS wise little more polished