Cleaned up NewEntryVC