More restructuring and renaming (dashboard is now overview)