Frist stage of update - removed breadcrumbs and simplified some stuff.