change css, fix error caused by merge, fix admin page