fixing mainview branch