Several changes to MainViewController Layout and some CoreData changes