fix render glitch of simple theme
misc. fix and improvement