Updated overview module (split into different modules)