[GF] Refactor of main view controller