Code refactored. Each view has a dedicated controller