DB tightening
Fixed multiple header rendering issue