btn fix, rmi sidebar css
Merge branch 'fac-layout-jay' into fac-layout