Create new VC for main screen
fix conflicts