CSS Fixes and minor features update