Small improvements in theme
Merge pull request #996 from martec/smallimprovtheme

Small improvements in theme