Few more updates to site structure