Move styling from sidebar to menu blocks
Merge branch 'refs/heads/master' into test