Added flatpages and imporved navigation