Added manual rebuild
Reg view tweaks