updates according to theme review

https://themes.trac.wordpress.org/ticket/18336