CSS changes & few bugs