Fixed CalendarActivity navigation. Organized imports and removed another unnecessary file.