move base styles to right place
update base