css and core improvement