colour fixing and some css
merge