Cleaning up homepage in order to properly detect position
Cleaning up the base templates