Added main view & more overrides