Fixed bugs with site layout