fix collapse, comment base.html, change theme