update style code
update code to make sidebar work well