Fix bug with search EJS template, other style tweaks