Refactored overview and it's views