small css changes
fixed merge