diff --git a/app/build.gradle b/app/build.gradle
index 214fd5c..299c427 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,13 +25,13 @@ def versionBuild = 9
 def versionBuildNameSuffix = ""
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 26
+    buildToolsVersion '26.0.0'
 
     defaultConfig {
         applicationId "co.timetableapp"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode versionMajor * 1000 + versionMinor * 100 + versionPatch * 10 + versionBuild
         versionName "$versionMajor.$versionMinor.$versionPatch" + versionBuildNameSuffix
 
diff --git a/app/src/main/java/co/timetableapp/licenses/LibraryDetailActivity.kt b/app/src/main/java/co/timetableapp/licenses/LibraryDetailActivity.kt
index 34ba917..5be7d7d 100644
--- a/app/src/main/java/co/timetableapp/licenses/LibraryDetailActivity.kt
+++ b/app/src/main/java/co/timetableapp/licenses/LibraryDetailActivity.kt
@@ -62,12 +62,12 @@ class LibraryDetailActivity : AppCompatActivity() {
     private fun setupLayout() {
         setupToolbar()
 
-        val container = findViewById(R.id.container) as LinearLayout
+        val container = findViewById<LinearLayout>(R.id.container)
         container.addView(makeLicenseCard(container))
     }
 
     private fun setupToolbar() {
-        val toolbar = findViewById(R.id.toolbar) as Toolbar
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
 
         with(supportActionBar!!) {
@@ -85,10 +85,9 @@ class LibraryDetailActivity : AppCompatActivity() {
         val card = layoutInflater.inflate(R.layout.item_license_card, container, false)
 
         with(card) {
-            (findViewById(R.id.title) as TextView).text = getString(R.string.title_license)
-            (findViewById(R.id.subtitle) as TextView).text = mLibrary!!.license.name
-            (findViewById(R.id.content_text) as TextView).text =
-                    mLibrary!!.license.getNotice(context)
+            findViewById<TextView>(R.id.title).text = getString(R.string.title_license)
+            findViewById<TextView>(R.id.subtitle).text = mLibrary!!.license.name
+            findViewById<TextView>(R.id.content_text).text = mLibrary!!.license.getNotice(context)
         }
 
         return card
diff --git a/app/src/main/java/co/timetableapp/licenses/LicensesActivity.kt b/app/src/main/java/co/timetableapp/licenses/LicensesActivity.kt
index 8a91042..980a16f 100644
--- a/app/src/main/java/co/timetableapp/licenses/LicensesActivity.kt
+++ b/app/src/main/java/co/timetableapp/licenses/LicensesActivity.kt
@@ -35,7 +35,7 @@ class LicensesActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_container)
 
-        val toolbar = findViewById(R.id.toolbar) as Toolbar
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
 
         toolbar.navigationIcon = UiUtils.tintDrawable(this, R.drawable.ic_arrow_back_black_24dp)
@@ -85,7 +85,7 @@ class LicensesActivity : AppCompatActivity() {
     }
 
     private fun displayCards() {
-        val container = findViewById(R.id.container) as LinearLayout
+        val container = findViewById<LinearLayout>(R.id.container)
 
         Collections.sort(mLibraries)
 
@@ -98,10 +98,10 @@ class LicensesActivity : AppCompatActivity() {
         val card = layoutInflater.inflate(R.layout.item_license_card, container, false)
 
         with(card) {
-            (findViewById(R.id.title) as TextView).text = library.name
-            (findViewById(R.id.subtitle) as TextView).text = library.author
+            findViewById<TextView>(R.id.title).text = library.name
+            findViewById<TextView>(R.id.subtitle).text = library.author
 
-            (findViewById(R.id.content_text) as TextView).text = library.license.getNotice(context)
+            findViewById<TextView>(R.id.content_text).text = library.license.getNotice(context)
 
             setOnClickListener {
                 val intent = Intent(context, LibraryDetailActivity::class.java)
diff --git a/app/src/main/java/co/timetableapp/ui/NewItemSelectorFragment.kt b/app/src/main/java/co/timetableapp/ui/NewItemSelectorFragment.kt
index 4941db8..4c81dfb 100644
--- a/app/src/main/java/co/timetableapp/ui/NewItemSelectorFragment.kt
+++ b/app/src/main/java/co/timetableapp/ui/NewItemSelectorFragment.kt
@@ -21,6 +21,7 @@ import android.support.design.widget.BottomSheetBehavior
 import android.support.design.widget.BottomSheetDialogFragment
 import android.support.design.widget.CoordinatorLayout
 import android.view.View
+import android.widget.FrameLayout
 import co.timetableapp.R
 import co.timetableapp.model.agenda.AgendaType
 
@@ -59,13 +60,13 @@ class NewItemSelectorFragment : BottomSheetDialogFragment() {
     }
 
     private fun setClickListeners(dialog: Dialog) {
-        dialog.findViewById(R.id.frameLayout_assignment).setOnClickListener {
+        dialog.findViewById<FrameLayout>(R.id.frameLayout_assignment).setOnClickListener {
             newItemAction?.invoke(it, dialog, AgendaType.ASSIGNMENT)
         }
-        dialog.findViewById(R.id.frameLayout_exam).setOnClickListener {
+        dialog.findViewById<FrameLayout>(R.id.frameLayout_exam).setOnClickListener {
             newItemAction?.invoke(it, dialog, AgendaType.EXAM)
         }
-        dialog.findViewById(R.id.frameLayout_event).setOnClickListener {
+        dialog.findViewById<FrameLayout>(R.id.frameLayout_event).setOnClickListener {
             newItemAction?.invoke(it, dialog, AgendaType.EVENT)
         }
     }
diff --git a/app/src/main/java/co/timetableapp/ui/agenda/AgendaActivity.kt b/app/src/main/java/co/timetableapp/ui/agenda/AgendaActivity.kt
index 00d19f5..bc74030 100644
--- a/app/src/main/java/co/timetableapp/ui/agenda/AgendaActivity.kt
+++ b/app/src/main/java/co/timetableapp/ui/agenda/AgendaActivity.kt
@@ -19,6 +19,7 @@ package co.timetableapp.ui.agenda
 import android.content.DialogInterface
 import android.content.Intent
 import android.os.Bundle
+import android.support.design.widget.FloatingActionButton
 import android.support.design.widget.NavigationView
 import android.support.design.widget.Snackbar
 import android.support.design.widget.TabLayout
@@ -59,7 +60,7 @@ class AgendaActivity : NavigationDrawerActivity() {
         const val DEFAULT_SHOW_PAST = false
     }
 
-    private val mViewPager by lazy { findViewById(R.id.viewPager) as ViewPager }
+    private val mViewPager by lazy { findViewById<ViewPager>(R.id.viewPager) }
 
     private var mShowCompleted = true
     private var mShowPast = DEFAULT_SHOW_PAST
@@ -75,14 +76,14 @@ class AgendaActivity : NavigationDrawerActivity() {
     }
 
     private fun setupToolbar() {
-        val toolbar = findViewById(R.id.toolbar) as Toolbar
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
     }
 
     private fun setupLayout() {
         mViewPager.adapter = PagerAdapter(supportFragmentManager)
 
-        val tabLayout = findViewById(R.id.tabLayout) as TabLayout
+        val tabLayout = findViewById<TabLayout>(R.id.tabLayout)
         tabLayout.setTabTextColors(
                 ContextCompat.getColor(this, R.color.mdu_text_white_secondary),
                 ContextCompat.getColor(this, R.color.mdu_text_white))
@@ -95,7 +96,7 @@ class AgendaActivity : NavigationDrawerActivity() {
     }
 
     private fun setupFab() {
-        findViewById(R.id.fab).setOnClickListener {
+        findViewById<FloatingActionButton>(R.id.fab).setOnClickListener {
             val dialogFragment = NewItemSelectorFragment()
 
             dialogFragment.onCreateNewAgendaItem { _, dialog, agendaType ->
@@ -184,11 +185,11 @@ class AgendaActivity : NavigationDrawerActivity() {
 
     override fun getSelfNavDrawerItem() = NAVDRAWER_ITEM_AGENDA
 
-    override fun getSelfToolbar() = findViewById(R.id.toolbar) as Toolbar
+    override fun getSelfToolbar(): Toolbar = findViewById(R.id.toolbar)
 
-    override fun getSelfDrawerLayout() = findViewById(R.id.drawerLayout) as DrawerLayout
+    override fun getSelfDrawerLayout(): DrawerLayout = findViewById(R.id.drawerLayout)
 
-    override fun getSelfNavigationView() = findViewById(R.id.navigationView) as NavigationView
+    override fun getSelfNavigationView(): NavigationView = findViewById(R.id.navigationView)
 
     /**
      * Interface definition for a callback to be invoked when the agenda filter has been updated.
diff --git a/app/src/main/java/co/timetableapp/ui/agenda/AgendaFragment.kt b/app/src/main/java/co/timetableapp/ui/agenda/AgendaFragment.kt
index 0503927..4163b8e 100644
--- a/app/src/main/java/co/timetableapp/ui/agenda/AgendaFragment.kt
+++ b/app/src/main/java/co/timetableapp/ui/agenda/AgendaFragment.kt
@@ -134,7 +134,7 @@ class AgendaFragment : Fragment(), AgendaActivity.OnFilterChangeListener {
     private fun setupLayout() {
         setupList()
 
-        mPlaceholderLayout = mRootView.findViewById(R.id.placeholder) as FrameLayout
+        mPlaceholderLayout = mRootView.findViewById(R.id.placeholder)
         refreshPlaceholderStatus()
     }
 
@@ -142,7 +142,7 @@ class AgendaFragment : Fragment(), AgendaActivity.OnFilterChangeListener {
         mDataHelper.createList(mItems)
 
         setupAdapter()
-        mRecyclerView = mRootView.findViewById(R.id.recyclerView) as RecyclerView
+        mRecyclerView = mRootView.findViewById(R.id.recyclerView)
         with(mRecyclerView) {
             layoutManager = LinearLayoutManager(activity)
             setHasFixedSize(true)
diff --git a/app/src/main/java/co/timetableapp/ui/agenda/AgendaItemsAdapter.kt b/app/src/main/java/co/timetableapp/ui/agenda/AgendaItemsAdapter.kt
index 14dd5f8..ee4079c 100644
--- a/app/src/main/java/co/timetableapp/ui/agenda/AgendaItemsAdapter.kt
+++ b/app/src/main/java/co/timetableapp/ui/agenda/AgendaItemsAdapter.kt
@@ -54,24 +54,19 @@ class AgendaItemsAdapter(
     }
 
     class HeaderViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val textView: TextView = itemView.findViewById(R.id.text) as TextView
+        val textView: TextView = itemView.findViewById(R.id.text)
     }
 
     inner class AgendaViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-        val colorView: View
-        val title: TextView
-        val subtitle: TextView
-        val info1: TextView
-        val info2: TextView
+        val colorView: View = itemView.findViewById(R.id.color)
+        val title: TextView = itemView.findViewById(R.id.text1)
+        val subtitle: TextView = itemView.findViewById(R.id.text2)
+        val info1: TextView = itemView.findViewById(R.id.text3)
+        val info2: TextView = itemView.findViewById(R.id.text4)
 
         init {
             itemView.setOnClickListener { onItemClick?.invoke(it, layoutPosition) }
-            colorView = itemView.findViewById(R.id.color)
-            title = itemView.findViewById(R.id.text1) as TextView
-            subtitle = itemView.findViewById(R.id.text2) as TextView
-            info1 = itemView.findViewById(R.id.text3) as TextView
-            info2 = itemView.findViewById(R.id.text4) as TextView
         }
 
     }
diff --git a/app/src/main/java/co/timetableapp/ui/assignments/AssignmentDetailActivity.kt b/app/src/main/java/co/timetableapp/ui/assignments/AssignmentDetailActivity.kt
index 65631e7..659ae16 100644
--- a/app/src/main/java/co/timetableapp/ui/assignments/AssignmentDetailActivity.kt
+++ b/app/src/main/java/co/timetableapp/ui/assignments/AssignmentDetailActivity.kt
@@ -54,12 +54,12 @@ class AssignmentDetailActivity : ItemDetailActivity<Assignment>() {
         setupToolbar()
 
         val dateFormatter = DateUtils.FORMATTER_FULL_DATE
-        (findViewById(R.id.textView_date) as TextView).text = mItem.dueDate.format(dateFormatter)
+        findViewById<TextView>(R.id.textView_date).text = mItem.dueDate.format(dateFormatter)
 
-        val progressText = findViewById(R.id.textView_progress) as TextView
+        val progressText = findViewById<TextView>(R.id.textView_progress)
         progressText.text = getString(R.string.property_progress, mItem.completionProgress)
 
-        val seekBar = findViewById(R.id.seekBar) as SeekBar
+        val seekBar = findViewById<SeekBar>(R.id.seekBar)
         with(seekBar) {
             max = 20 // so it goes up in 5s
             progress = mItem.completionProgress / 5
@@ -77,12 +77,12 @@ class AssignmentDetailActivity : ItemDetailActivity<Assignment>() {
             })
         }
 
-        val detailText = findViewById(R.id.textView_detail) as TextView
+        val detailText = findViewById<TextView>(R.id.textView_detail)
         UiUtils.formatNotesTextView(this, detailText, mItem.detail)
     }
 
     private fun setupToolbar() {
-        val toolbar = findViewById(R.id.toolbar) as Toolbar
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
 
         toolbar.navigationIcon = UiUtils.tintDrawable(this, R.drawable.ic_arrow_back_black_24dp)
@@ -91,10 +91,10 @@ class AssignmentDetailActivity : ItemDetailActivity<Assignment>() {
         val cls = Class.create(this, mItem.classId)
         val subject = Subject.create(this, cls.subjectId)
 
-        val textViewTitle = findViewById(R.id.title) as TextView
+        val textViewTitle = findViewById<TextView>(R.id.title)
         textViewTitle.text = mItem.title
 
-        val textViewSubtitle = findViewById(R.id.subtitle) as TextView
+        val textViewSubtitle = findViewById<TextView>(R.id.subtitle)
         textViewSubtitle.text = subject.name
 
         val color = Color(subject.colorId)
diff --git a/app/src/main/java/co/timetableapp/ui/assignments/AssignmentEditActivity.kt b/app/src/main/java/co/timetableapp/ui/assignments/AssignmentEditActivity.kt
index f695ffd..2ef3dbf 100644
--- a/app/src/main/java/co/timetableapp/ui/assignments/AssignmentEditActivity.kt
+++ b/app/src/main/java/co/timetableapp/ui/assignments/AssignmentEditActivity.kt
@@ -82,7 +82,7 @@ class AssignmentEditActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_assignment_edit)
 
-        mToolbar = findViewById(R.id.toolbar) as Toolbar
+        mToolbar = findViewById(R.id.toolbar)
         setSupportActionBar(mToolbar)
 
         val extras = intent.extras
@@ -105,12 +105,12 @@ class AssignmentEditActivity : AppCompatActivity() {
     }
 
     private fun setupLayout() {
-        mTitleEditText = findViewById(R.id.editText_title) as EditText
+        mTitleEditText = findViewById(R.id.editText_title)
         if (!mIsNew) {
             mTitleEditText.setText(mAssignment!!.title)
         }
 
-        mDetailEditText = findViewById(R.id.editText_detail) as EditText
+        mDetailEditText = findViewById(R.id.editText_detail)
         if (!mIsNew) {
             mDetailEditText.setText(mAssignment!!.detail)
         }
@@ -120,7 +120,7 @@ class AssignmentEditActivity : AppCompatActivity() {
     }
 
     private fun setupClassText() {
-        mClassText = findViewById(R.id.textView_class) as TextView
+        mClassText = findViewById(R.id.textView_class)
 
         if (!mIsNew) {
             mClass = Class.create(this, mAssignment!!.classId)
@@ -149,7 +149,7 @@ class AssignmentEditActivity : AppCompatActivity() {
             }
 
             val titleView = layoutInflater.inflate(R.layout.dialog_title_with_padding, null)
-            (titleView.findViewById(R.id.title) as TextView).setText(R.string.choose_class)
+            titleView.findViewById<TextView>(R.id.title).setText(R.string.choose_class)
 
             builder.setView(recyclerView)
                     .setCustomTitle(titleView)
@@ -160,7 +160,7 @@ class AssignmentEditActivity : AppCompatActivity() {
     }
 
     private fun setupDateText() {
-        mDateText = findViewById(R.id.textView_date) as TextView
+        mDateText = findViewById(R.id.textView_date)
 
         if (!mIsNew) {
             mDueDate = mAssignment!!.dueDate
diff --git a/app/src/main/java/co/timetableapp/ui/base/ItemEditActivity.kt b/app/src/main/java/co/timetableapp/ui/base/ItemEditActivity.kt
index dbff11c..53de852 100644
--- a/app/src/main/java/co/timetableapp/ui/base/ItemEditActivity.kt
+++ b/app/src/main/java/co/timetableapp/ui/base/ItemEditActivity.kt
@@ -104,7 +104,7 @@ abstract class ItemEditActivity<T : BaseItem> : AppCompatActivity() {
     }
 
     private fun setupToolbar(): Toolbar {
-        val toolbar = findViewById(R.id.toolbar) as Toolbar
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
 
         supportActionBar!!.setTitle(getTitleRes(mIsNew))
diff --git a/app/src/main/java/co/timetableapp/ui/classes/ClassDetailActivity.kt b/app/src/main/java/co/timetableapp/ui/classes/ClassDetailActivity.kt
index 4e9c864..3452507 100644
--- a/app/src/main/java/co/timetableapp/ui/classes/ClassDetailActivity.kt
+++ b/app/src/main/java/co/timetableapp/ui/classes/ClassDetailActivity.kt
@@ -23,6 +23,7 @@ import android.support.v4.content.ContextCompat
 import android.support.v7.widget.Toolbar
 import android.text.Html
 import android.view.View
+import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
 import co.timetableapp.R
@@ -68,7 +69,7 @@ class ClassDetailActivity : ItemDetailActivity<Class>() {
         setupToolbar()
         setupClassDetailCard()
 
-        findViewById(R.id.main_card).setBackgroundColor(
+        findViewById<View>(R.id.main_card).setBackgroundColor(
                 ContextCompat.getColor(this, mColor.getLightAccentColorRes(this)))
 
         setupRelatedItemCards()
@@ -77,7 +78,7 @@ class ClassDetailActivity : ItemDetailActivity<Class>() {
     private fun setupToolbar() {
         val subject = Subject.create(this, mItem.subjectId)
 
-        val toolbar = findViewById(R.id.toolbar) as Toolbar
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
 
         toolbar.navigationIcon = UiUtils.tintDrawable(this, R.drawable.ic_arrow_back_black_24dp)
@@ -161,19 +162,19 @@ class ClassDetailActivity : ItemDetailActivity<Class>() {
      */
     private fun setClassDetailTexts(locations: String, teachers: String, classTimes: String) {
         val locationVisibility = if (locations.isEmpty()) View.GONE else View.VISIBLE
-        findViewById(R.id.viewGroup_location).visibility = locationVisibility
+        findViewById<ViewGroup>(R.id.viewGroup_location).visibility = locationVisibility
         if (locations.isNotEmpty()) {
-            (findViewById(R.id.textView_location) as TextView).text = locations
+            findViewById<TextView>(R.id.textView_location).text = locations
         }
 
         val teacherVisibility = if (teachers.isEmpty()) View.GONE else View.VISIBLE
-        findViewById(R.id.viewGroup_teacher).visibility = teacherVisibility
+        findViewById<ViewGroup>(R.id.viewGroup_teacher).visibility = teacherVisibility
         if (teachers.isNotEmpty()) {
-            (findViewById(R.id.textView_teacher) as TextView).text = teachers
+            findViewById<TextView>(R.id.textView_teacher).text = teachers
         }
 
         // No need to check if it's empty - all class details must have a class time
-        val textViewTimes = findViewById(R.id.textView_times) as TextView
+        val textViewTimes = findViewById<TextView>(R.id.textView_times)
         textViewTimes.text = classTimes
     }
 
@@ -182,7 +183,7 @@ class ClassDetailActivity : ItemDetailActivity<Class>() {
      * exams for this class.
      */
     private fun setupRelatedItemCards() {
-        val cardContainer = findViewById(R.id.card_container) as LinearLayout
+        val cardContainer = findViewById<LinearLayout>(R.id.card_container)
 
         val assignmentsCard = CardOfItems.Builder(this, cardContainer)
                 .setTitle(R.string.title_assignments)
diff --git a/app/src/main/java/co/timetableapp/ui/classes/ClassEditActivity.kt b/app/src/main/java/co/timetableapp/ui/classes/ClassEditActivity.kt
index 5c4f865..49b2938 100644
--- a/app/src/main/java/co/timetableapp/ui/classes/ClassEditActivity.kt
+++ b/app/src/main/java/co/timetableapp/ui/classes/ClassEditActivity.kt
@@ -100,9 +100,9 @@ class ClassEditActivity : ItemEditActivity<Class>() {
     }
 
     override fun setupLayout() {
-        mAppBarLayout = findViewById(R.id.appBarLayout) as AppBarLayout
+        mAppBarLayout = findViewById(R.id.appBarLayout)
 
-        mModuleEditText = findViewById(R.id.editText_module) as EditText
+        mModuleEditText = findViewById(R.id.editText_module)
         if (!mIsNew) {
             mModuleEditText.setText(mItem!!.moduleName)
         }
@@ -118,8 +118,8 @@ class ClassEditActivity : ItemEditActivity<Class>() {
     }
 
     private fun setupDateTexts() {
-        mStartDateText = findViewById(R.id.textView_start_date) as TextView
-        mEndDateText = findViewById(R.id.textView_end_date) as TextView
+        mStartDateText = findViewById(R.id.textView_start_date)
+        mEndDateText = findViewById(R.id.textView_end_date)
 
         if (!mIsNew && mItem!!.hasStartEndDates()) {
             mStartDate = mItem!!.startDate
@@ -185,8 +185,8 @@ class ClassEditActivity : ItemEditActivity<Class>() {
     }
 
     private fun setupDateSwitch() {
-        val datesSwitch = findViewById(R.id.dates_switch) as Switch
-        val datesSection = findViewById(R.id.dates_section)
+        val datesSwitch = findViewById<Switch>(R.id.dates_switch)
+        val datesSection = findViewById<ViewGroup>(R.id.dates_section)
 
         datesSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
@@ -213,10 +213,10 @@ class ClassEditActivity : ItemEditActivity<Class>() {
     }
 
     private fun setupExpandToggle() {
-        val detailSection = findViewById(R.id.linearLayout_details)
+        val detailSection = findViewById<LinearLayout>(R.id.linearLayout_details)
 
-        val expandToggle = findViewById(R.id.expand_toggle)
-        val expandIcon = findViewById(R.id.expand_icon) as ImageView
+        val expandToggle = findViewById<ViewGroup>(R.id.expand_toggle)
+        val expandIcon = findViewById<ImageView>(R.id.expand_icon)
 
         expandToggle.setOnClickListener(object : View.OnClickListener {
             internal var mIsExpanded = false
@@ -274,10 +274,10 @@ class ClassEditActivity : ItemEditActivity<Class>() {
      * @see populateTabs
      */
     private fun setupTabs() {
-        mTabLayout = findViewById(R.id.tabLayout) as TabLayout
+        mTabLayout = findViewById(R.id.tabLayout)
         mTabLayout.tabMode = TabLayout.MODE_SCROLLABLE
 
-        val viewPager = findViewById(R.id.viewPager) as ViewPager
+        val viewPager = findViewById<ViewPager>(R.id.viewPager)
         viewPager.adapter = mPagerAdapter
 
         mTabLayout.setupWithViewPager(viewPager)
@@ -315,17 +315,17 @@ class ClassEditActivity : ItemEditActivity<Class>() {
 
         val page = layoutInflater.inflate(R.layout.fragment_class_edit, null)
 
-        val room = page.findViewById(R.id.editText_room) as EditText
+        val room = page.findViewById<EditText>(R.id.editText_room)
         if (!isNewDetail) {
             room.setText(classDetail!!.room)
         }
 
-        val building = page.findViewById(R.id.editText_building) as EditText
+        val building = page.findViewById<EditText>(R.id.editText_building)
         if (!isNewDetail) {
             building.setText(classDetail!!.building)
         }
 
-        val teacher = page.findViewById(R.id.editText_teacher) as EditText
+        val teacher = page.findViewById<EditText>(R.id.editText_teacher)
         if (!isNewDetail) {
             teacher.setText(classDetail!!.teacher)
         }
@@ -365,14 +365,14 @@ class ClassEditActivity : ItemEditActivity<Class>() {
 
         mAdapters.add(adapter)
 
-        val recyclerView = page.findViewById(R.id.recyclerView) as RecyclerView
+        val recyclerView = page.findViewById<RecyclerView>(R.id.recyclerView)
         recyclerView.setHasFixedSize(true)
         recyclerView.layoutManager = object : LinearLayoutManager(this) {
             override fun canScrollVertically() = false
         }
         recyclerView.adapter = adapter
 
-        val btnAddTime = page.findViewById(R.id.button_add_time) as Button
+        val btnAddTime = page.findViewById<Button>(R.id.button_add_time)
         btnAddTime.setOnClickListener { view ->
             val intent = Intent(this, ClassTimeEditActivity::class.java)
             intent.putExtra(ClassTimeEditActivity.EXTRA_CLASS_DETAIL_ID, classDetailId)
@@ -392,10 +392,10 @@ class ClassEditActivity : ItemEditActivity<Class>() {
         }
 
         if (placeholder) {
-            val content = page.findViewById(R.id.content) as ViewGroup
+            val content = page.findViewById<ViewGroup>(R.id.content)
             content.visibility = View.GONE
 
-            val btnAddTab = page.findViewById(R.id.button_add_tab) as Button
+            val btnAddTab = page.findViewById<Button>(R.id.button_add_tab)
             btnAddTab.visibility = View.VISIBLE
             btnAddTab.setOnClickListener {
                 content.visibility = View.VISIBLE
@@ -521,13 +521,13 @@ class ClassEditActivity : ItemEditActivity<Class>() {
 
             val classDetailId = mClassDetailIds[i]
 
-            val roomText = page.findViewById(R.id.editText_room) as EditText
+            val roomText = page.findViewById<EditText>(R.id.editText_room)
             val room = roomText.text.toString().title()
 
-            val buildingText = page.findViewById(R.id.editText_building) as EditText
+            val buildingText = page.findViewById<EditText>(R.id.editText_building)
             val building = buildingText.text.toString().title()
 
-            val teacherText = page.findViewById(R.id.editText_teacher) as EditText
+            val teacherText = page.findViewById<EditText>(R.id.editText_teacher)
             val teacher = teacherText.text.toString().title()
 
             val classTimeGroups = mAllClassTimeGroups[i]
diff --git a/app/src/main/java/co/timetableapp/ui/classes/ClassTimesAdapter.kt b/app/src/main/java/co/timetableapp/ui/classes/ClassTimesAdapter.kt
index fa040b8..b159e9c 100644
--- a/app/src/main/java/co/timetableapp/ui/classes/ClassTimesAdapter.kt
+++ b/app/src/main/java/co/timetableapp/ui/classes/ClassTimesAdapter.kt
@@ -83,8 +83,8 @@ class ClassTimesAdapter(
 
     inner class ClassTimesViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-        val timeText = itemView.findViewById(R.id.time) as TextView
-        val dayText = itemView.findViewById(R.id.day) as TextView
+        val timeText: TextView = itemView.findViewById(R.id.time)
+        val dayText: TextView = itemView.findViewById(R.id.day)
 
         init {
             itemView.setOnClickListener { onItemClick?.invoke(it, layoutPosition) }
diff --git a/app/src/main/java/co/timetableapp/ui/classes/ClassesActivity.kt b/app/src/main/java/co/timetableapp/ui/classes/ClassesActivity.kt
index adb386c..4b75cdf 100644
--- a/app/src/main/java/co/timetableapp/ui/classes/ClassesActivity.kt
+++ b/app/src/main/java/co/timetableapp/ui/classes/ClassesActivity.kt
@@ -48,16 +48,16 @@ class ClassesActivity : NavigationDrawerActivity() {
     }
 
     private fun setupToolbar() {
-        val toolbar = findViewById(R.id.toolbar) as Toolbar
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
     }
 
     override fun getSelfNavDrawerItem() = NAVDRAWER_ITEM_CLASSES
 
-    override fun getSelfToolbar() = findViewById(R.id.toolbar) as Toolbar
+    override fun getSelfToolbar(): Toolbar = findViewById(R.id.toolbar)
 
-    override fun getSelfDrawerLayout() = findViewById(R.id.drawerLayout) as DrawerLayout
+    override fun getSelfDrawerLayout(): DrawerLayout = findViewById(R.id.drawerLayout)
 
-    override fun getSelfNavigationView() = findViewById(R.id.navigationView) as NavigationView
+    override fun getSelfNavigationView(): NavigationView = findViewById(R.id.navigationView)
 
 }
diff --git a/app/src/main/java/co/timetableapp/ui/classes/ClassesAdapter.kt b/app/src/main/java/co/timetableapp/ui/classes/ClassesAdapter.kt
index 57bb230..165623b 100644
--- a/app/src/main/java/co/timetableapp/ui/classes/ClassesAdapter.kt
+++ b/app/src/main/java/co/timetableapp/ui/classes/ClassesAdapter.kt
@@ -93,9 +93,9 @@ class ClassesAdapter(
 
     inner class ClassesViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-        val colorView = itemView.findViewById(R.id.color)!!
-        val subjectText = itemView.findViewById(R.id.subject) as TextView
-        val detailText = itemView.findViewById(R.id.class_details) as TextView
+        val colorView: View = itemView.findViewById(R.id.color)
+        val subjectText: TextView = itemView.findViewById(R.id.subject)
+        val detailText: TextView = itemView.findViewById(R.id.class_details)
 
         init {
             itemView.setOnClickListener { onItemClick?.invoke(it, layoutPosition) }
diff --git a/app/src/main/java/co/timetableapp/ui/classes/ClassesFragment.kt b/app/src/main/java/co/timetableapp/ui/classes/ClassesFragment.kt
index d5e0cdb..366efe3 100644
--- a/app/src/main/java/co/timetableapp/ui/classes/ClassesFragment.kt
+++ b/app/src/main/java/co/timetableapp/ui/classes/ClassesFragment.kt
@@ -20,6 +20,7 @@ import android.app.Activity
 import android.content.DialogInterface
 import android.content.Intent
 import android.os.Bundle
+import android.support.design.widget.FloatingActionButton
 import android.support.v4.app.ActivityOptionsCompat
 import android.support.v7.app.AlertDialog
 import android.support.v7.widget.RecyclerView
@@ -57,7 +58,7 @@ class ClassesFragment : ItemListFragment<Class>() {
     }
 
     private fun setupFab() {
-        activity.findViewById(R.id.fab).setOnClickListener {
+        activity.findViewById<FloatingActionButton>(R.id.fab).setOnClickListener {
             val intent = Intent(activity, ClassEditActivity::class.java)
             startActivityForResult(intent, REQUEST_CODE_CLASS_DETAIL)
         }
diff --git a/app/src/main/java/co/timetableapp/ui/components/CardOfItems.kt b/app/src/main/java/co/timetableapp/ui/components/CardOfItems.kt
index e73f298..6e82668 100644
--- a/app/src/main/java/co/timetableapp/ui/components/CardOfItems.kt
+++ b/app/src/main/java/co/timetableapp/ui/components/CardOfItems.kt
@@ -110,7 +110,7 @@ class CardOfItems private constructor(val view: View) {
             val card = inflater.inflate(R.layout.item_card_of_items, mRoot, false)
 
             with(card) {
-                val titleView = findViewById(R.id.title) as TextView
+                val titleView = findViewById<TextView>(R.id.title)
                 if (mTitle == null) {
                     titleView.visibility = View.GONE
                 } else {
@@ -118,13 +118,13 @@ class CardOfItems private constructor(val view: View) {
                 }
 
                 if (mItems != null && mItems!!.isNotEmpty()) {
-                    val container = findViewById(R.id.container) as LinearLayout
+                    val container = findViewById<LinearLayout>(R.id.container)
 
                     container.removeAllViews() // by default contains a placeholder text
                     populateCardContainer(container, mItems!!)
                 }
 
-                val button = findViewById(R.id.button) as Button
+                val button = findViewById<Button>(R.id.button)
                 if (mButtonText == null) {
                     button.visibility = View.GONE
                 } else {
@@ -145,10 +145,10 @@ class CardOfItems private constructor(val view: View) {
                         .inflate(R.layout.item_condensed, container, false)
 
                 with(itemView) {
-                    (findViewById(R.id.title) as TextView).text = it.title
-                    (findViewById(R.id.subtitle) as TextView).text = it.subtitle
+                    findViewById<TextView>(R.id.title).text = it.title
+                    findViewById<TextView>(R.id.subtitle).text = it.subtitle
 
-                    val imageView = findViewById(R.id.icon) as ImageView
+                    val imageView = findViewById<ImageView>(R.id.icon)
                     mItemsIconRes?.let {
                         imageView.setImageResource(it)
                     }
diff --git a/app/src/main/java/co/timetableapp/ui/components/SubjectSelectorHelper.kt b/app/src/main/java/co/timetableapp/ui/components/SubjectSelectorHelper.kt
index 525a205..0eba538 100644
--- a/app/src/main/java/co/timetableapp/ui/components/SubjectSelectorHelper.kt
+++ b/app/src/main/java/co/timetableapp/ui/components/SubjectSelectorHelper.kt
@@ -37,7 +37,7 @@ class SubjectSelectorHelper(val activity: Activity, @IdRes val textViewResId: In
     var onNewSubjectListener: DialogInterface.OnClickListener? = null
     var onSubjectChangeListener: OnSubjectChangeListener? = null
 
-    private val mTextView = activity.findViewById(textViewResId) as TextView
+    private val mTextView: TextView = activity.findViewById(textViewResId)
 
     private var mSubjectDialog: AlertDialog? = null
 
@@ -74,7 +74,7 @@ class SubjectSelectorHelper(val activity: Activity, @IdRes val textViewResId: In
         recyclerView.adapter = adapter
 
         val titleView = activity.layoutInflater.inflate(R.layout.dialog_title_with_padding, null)
-        (titleView.findViewById(R.id.title) as TextView).setText(R.string.choose_subject)
+        titleView.findViewById<TextView>(R.id.title).setText(R.string.choose_subject)
 
         builder.setView(recyclerView)
                 .setCustomTitle(titleView)
diff --git a/app/src/main/java/co/timetableapp/ui/events/EventDetailActivity.kt b/app/src/main/java/co/timetableapp/ui/events/EventDetailActivity.kt
index bf3d455..10b1a86 100644
--- a/app/src/main/java/co/timetableapp/ui/events/EventDetailActivity.kt
+++ b/app/src/main/java/co/timetableapp/ui/events/EventDetailActivity.kt
@@ -23,6 +23,7 @@ import android.support.v4.app.ActivityCompat
 import android.support.v4.content.ContextCompat
 import android.support.v7.widget.Toolbar
 import android.view.View
+import android.view.ViewGroup
 import android.widget.TextView
 import co.timetableapp.R
 import co.timetableapp.data.handler.EventHandler
@@ -63,13 +64,13 @@ class EventDetailActivity : ItemDetailActivity<Event>() {
     }
 
     private fun setupToolbar() {
-        val toolbar = findViewById(R.id.toolbar) as Toolbar
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
 
         toolbar.navigationIcon = UiUtils.tintDrawable(this, R.drawable.ic_arrow_back_black_24dp)
         toolbar.setNavigationOnClickListener { saveEditsAndClose() }
 
-        (findViewById(R.id.title) as TextView).text = mItem.title
+        findViewById<TextView>(R.id.title).text = mItem.title
 
         val color = if (mItem.hasRelatedSubject()) {
             Color(mItem.getRelatedSubject(this)!!.colorId)
@@ -82,7 +83,7 @@ class EventDetailActivity : ItemDetailActivity<Event>() {
     private fun setupDateText() {
         val dateFormatter = DateUtils.FORMATTER_FULL_DATE
 
-        val textView = findViewById(R.id.textView_date) as TextView
+        val textView = findViewById<TextView>(R.id.textView_date)
         textView.text = if (mItem.hasDifferentStartEndDates()) {
             "${mItem.startDateTime.format(dateFormatter)} - ${mItem.endDateTime.format(dateFormatter)}"
         } else {
@@ -95,11 +96,11 @@ class EventDetailActivity : ItemDetailActivity<Event>() {
 
         val timeText = mItem.startDateTime.format(timeFormatter) + " - " +
                 mItem.endDateTime.format(timeFormatter)
-        (findViewById(R.id.textView_times) as TextView).text = timeText
+        findViewById<TextView>(R.id.textView_times).text = timeText
     }
 
     private fun setupNotesText() {
-        val notesText = findViewById(R.id.textView_notes) as TextView
+        val notesText = findViewById<TextView>(R.id.textView_notes)
         with(notesText) {
             if (mItem.hasNotes()) {
                 text = mItem.notes
@@ -117,23 +118,22 @@ class EventDetailActivity : ItemDetailActivity<Event>() {
 
     private fun setupLocationText() {
         if (!mItem.hasLocation()) {
-            findViewById(R.id.divider_location).visibility = View.GONE
-            findViewById(R.id.viewGroup_location).visibility = View.GONE
+            findViewById<View>(R.id.divider_location).visibility = View.GONE
+            findViewById<ViewGroup>(R.id.viewGroup_location).visibility = View.GONE
             return
         }
 
-        (findViewById(R.id.textView_location) as TextView).text = mItem.location
+        findViewById<TextView>(R.id.textView_location).text = mItem.location
     }
 
     private fun setupSubjectText() {
         if (!mItem.hasRelatedSubject()) {
-            findViewById(R.id.divider_subject).visibility = View.GONE
-            findViewById(R.id.viewGroup_subject).visibility = View.GONE
+            findViewById<View>(R.id.divider_subject).visibility = View.GONE
+            findViewById<ViewGroup>(R.id.viewGroup_subject).visibility = View.GONE
             return
         }
 
-        (findViewById(R.id.textView_subject) as TextView).text =
-                mItem.getRelatedSubject(this)!!.name
+        findViewById<TextView>(R.id.textView_subject).text = mItem.getRelatedSubject(this)!!.name
     }
 
     override fun onMenuEditClick() {
diff --git a/app/src/main/java/co/timetableapp/ui/exams/ExamDetailActivity.kt b/app/src/main/java/co/timetableapp/ui/exams/ExamDetailActivity.kt
index a701dd7..82158df 100644
--- a/app/src/main/java/co/timetableapp/ui/exams/ExamDetailActivity.kt
+++ b/app/src/main/java/co/timetableapp/ui/exams/ExamDetailActivity.kt
@@ -21,6 +21,7 @@ import android.content.Intent
 import android.support.v4.app.ActivityCompat
 import android.support.v7.widget.Toolbar
 import android.view.View
+import android.view.ViewGroup
 import android.widget.TextView
 import co.timetableapp.R
 import co.timetableapp.data.handler.ExamHandler
@@ -54,47 +55,47 @@ class ExamDetailActivity : ItemDetailActivity<Exam>() {
         setupToolbar()
 
         val dateFormatter = DateUtils.FORMATTER_FULL_DATE
-        (findViewById(R.id.textView_date) as TextView).text = mItem.date.format(dateFormatter)
+        findViewById<TextView>(R.id.textView_date).text = mItem.date.format(dateFormatter)
 
         val timeText =
                 "${mItem.startTime} - ${mItem.startTime.plusMinutes(mItem.duration.toLong())}"
-        (findViewById(R.id.textView_times) as TextView).text = timeText
+        findViewById<TextView>(R.id.textView_times).text = timeText
 
-        val seatGroup = findViewById(R.id.viewGroup_seat)
+        val seatGroup = findViewById<ViewGroup>(R.id.viewGroup_seat)
         if (mItem.hasSeat()) {
             seatGroup.visibility = View.VISIBLE
-            (findViewById(R.id.textView_seat) as TextView).text = mItem.seat
+            findViewById<TextView>(R.id.textView_seat).text = mItem.seat
         } else {
             seatGroup.visibility = View.GONE
         }
 
-        val roomGroup = findViewById(R.id.viewGroup_room)
+        val roomGroup = findViewById<ViewGroup>(R.id.viewGroup_room)
         if (mItem.hasRoom()) {
             roomGroup.visibility = View.VISIBLE
-            (findViewById(R.id.textView_room) as TextView).text = mItem.room
+            findViewById<TextView>(R.id.textView_room).text = mItem.room
         } else {
             roomGroup.visibility = View.GONE
         }
 
-        findViewById(R.id.location_divider).visibility =
+        findViewById<View>(R.id.location_divider).visibility =
                 if (!mItem.hasRoom() && !mItem.hasSeat()) View.GONE else View.VISIBLE
 
-        val viewGroupResit = findViewById(R.id.viewGroup_resit)
+        val viewGroupResit = findViewById<ViewGroup>(R.id.viewGroup_resit)
         viewGroupResit.visibility = if (mItem.resit) View.VISIBLE else View.GONE
 
-        val notesText = findViewById(R.id.textView_notes) as TextView
+        val notesText = findViewById<TextView>(R.id.textView_notes)
         UiUtils.formatNotesTextView(this, notesText, mItem.notes)
     }
 
     private fun setupToolbar() {
-        val toolbar = findViewById(R.id.toolbar) as Toolbar
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
 
         toolbar.navigationIcon = UiUtils.tintDrawable(this, R.drawable.ic_arrow_back_black_24dp)
         toolbar.setNavigationOnClickListener { saveEditsAndClose() }
 
         val subject = Subject.create(this, mItem.subjectId)
-        (findViewById(R.id.title) as TextView).text = mItem.makeName(subject)
+        findViewById<TextView>(R.id.title).text = mItem.makeName(subject)
 
         val color = Color(subject.colorId)
         UiUtils.setBarColors(color, this, toolbar)
diff --git a/app/src/main/java/co/timetableapp/ui/home/HomeItemsAdapter.kt b/app/src/main/java/co/timetableapp/ui/home/HomeItemsAdapter.kt
index d7aae8b..a202869 100644
--- a/app/src/main/java/co/timetableapp/ui/home/HomeItemsAdapter.kt
+++ b/app/src/main/java/co/timetableapp/ui/home/HomeItemsAdapter.kt
@@ -55,7 +55,7 @@ class HomeItemsAdapter(
 
     private inner class HeaderViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-        val title = itemView.findViewById(R.id.title) as TextView
+        val title: TextView = itemView.findViewById(R.id.title)
 
         init {
             itemView.setOnClickListener { onHeaderClick?.invoke(it!!, layoutPosition) }
@@ -65,10 +65,10 @@ class HomeItemsAdapter(
     private inner class HomeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
         val colorView: View = itemView.findViewById(R.id.color)
-        val title = itemView.findViewById(R.id.title) as TextView
-        val subtitle = itemView.findViewById(R.id.subtitle) as TextView
-        val times = itemView.findViewById(R.id.times) as TextView
-        val boxedText = itemView.findViewById(R.id.assignment_text) as TextView
+        val title: TextView = itemView.findViewById(R.id.title)
+        val subtitle: TextView = itemView.findViewById(R.id.subtitle)
+        val times: TextView = itemView.findViewById(R.id.times)
+        val boxedText: TextView = itemView.findViewById(R.id.assignment_text)
 
         init {
             itemView.setOnClickListener { onItemClick?.invoke(it!!, layoutPosition) }
diff --git a/app/src/main/java/co/timetableapp/ui/home/MainActivity.kt b/app/src/main/java/co/timetableapp/ui/home/MainActivity.kt
index c719d5a..0d619fe 100644
--- a/app/src/main/java/co/timetableapp/ui/home/MainActivity.kt
+++ b/app/src/main/java/co/timetableapp/ui/home/MainActivity.kt
@@ -18,6 +18,7 @@ package co.timetableapp.ui.home
 
 import android.content.Intent
 import android.os.Bundle
+import android.support.design.widget.FloatingActionButton
 import android.support.design.widget.NavigationView
 import android.support.design.widget.TabLayout
 import android.support.v4.app.Fragment
@@ -51,7 +52,7 @@ class MainActivity : NavigationDrawerActivity() {
         const val REQUEST_CODE_ITEM_DETAIL = 1
     }
 
-    private val mViewPager by lazy { findViewById(R.id.viewPager) as ViewPager }
+    private val mViewPager by lazy { findViewById<ViewPager>(R.id.viewPager) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -63,7 +64,7 @@ class MainActivity : NavigationDrawerActivity() {
     private fun setupLayout() {
         mViewPager.adapter = PagerAdapter(supportFragmentManager)
 
-        val tabLayout = findViewById(R.id.tabLayout) as TabLayout
+        val tabLayout = findViewById<TabLayout>(R.id.tabLayout)
         tabLayout.setTabTextColors(
                 ContextCompat.getColor(this, R.color.mdu_text_white_secondary),
                 ContextCompat.getColor(this, R.color.mdu_text_white))
@@ -76,7 +77,7 @@ class MainActivity : NavigationDrawerActivity() {
     }
 
     private fun setupFab() {
-        findViewById(R.id.fab).setOnClickListener {
+        findViewById<FloatingActionButton>(R.id.fab).setOnClickListener {
             val dialogFragment = NewItemSelectorFragment()
 
             dialogFragment.onCreateNewAgendaItem { _, dialog, agendaType ->
@@ -104,13 +105,13 @@ class MainActivity : NavigationDrawerActivity() {
         }
     }
 
-    override fun getSelfToolbar() = findViewById(R.id.toolbar) as Toolbar
+    override fun getSelfToolbar(): Toolbar = findViewById(R.id.toolbar)
 
-    override fun getSelfDrawerLayout() = findViewById(R.id.drawerLayout) as DrawerLayout
+    override fun getSelfDrawerLayout(): DrawerLayout = findViewById(R.id.drawerLayout)
 
     override fun getSelfNavDrawerItem() = NAVDRAWER_ITEM_HOME
 
-    override fun getSelfNavigationView() = findViewById(R.id.navigationView) as NavigationView
+    override fun getSelfNavigationView(): NavigationView = findViewById(R.id.navigationView)
 
     private inner class PagerAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm) {
 
diff --git a/app/src/main/java/co/timetableapp/ui/home/TodayFragment.kt b/app/src/main/java/co/timetableapp/ui/home/TodayFragment.kt
index dbc8d71..3c872fc 100644
--- a/app/src/main/java/co/timetableapp/ui/home/TodayFragment.kt
+++ b/app/src/main/java/co/timetableapp/ui/home/TodayFragment.kt
@@ -105,7 +105,7 @@ class TodayFragment : Fragment() {
             startActivity(intent)
         }
 
-        val recyclerView = rootView.findViewById(R.id.recyclerView) as RecyclerView
+        val recyclerView = rootView.findViewById<RecyclerView>(R.id.recyclerView)
         with(recyclerView) {
             layoutManager = LinearLayoutManager(activity)
             setHasFixedSize(true)
diff --git a/app/src/main/java/co/timetableapp/ui/home/UpcomingFragment.kt b/app/src/main/java/co/timetableapp/ui/home/UpcomingFragment.kt
index 6da996c..f939c73 100644
--- a/app/src/main/java/co/timetableapp/ui/home/UpcomingFragment.kt
+++ b/app/src/main/java/co/timetableapp/ui/home/UpcomingFragment.kt
@@ -99,7 +99,7 @@ class UpcomingFragment : Fragment() {
             startActivity(intent)
         }
 
-        val recyclerView = rootView.findViewById(R.id.recyclerView) as RecyclerView
+        val recyclerView = rootView.findViewById<RecyclerView>(R.id.recyclerView)
         with(recyclerView) {
             layoutManager = LinearLayoutManager(activity)
             setHasFixedSize(true)
diff --git a/app/src/main/java/co/timetableapp/ui/schedule/ScheduleActivity.kt b/app/src/main/java/co/timetableapp/ui/schedule/ScheduleActivity.kt
index e364e8e..b662d85 100644
--- a/app/src/main/java/co/timetableapp/ui/schedule/ScheduleActivity.kt
+++ b/app/src/main/java/co/timetableapp/ui/schedule/ScheduleActivity.kt
@@ -63,7 +63,7 @@ class ScheduleActivity : NavigationDrawerActivity() {
     }
 
     private lateinit var mPagerAdapter: DynamicPagerAdapter
-    private val mViewPager by lazy { findViewById(R.id.viewPager) as ViewPager }
+    private val mViewPager by lazy { findViewById<ViewPager>(R.id.viewPager) as ViewPager }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -74,12 +74,12 @@ class ScheduleActivity : NavigationDrawerActivity() {
     }
 
     private fun setupToolbar() {
-        val toolbar = findViewById(R.id.toolbar) as Toolbar
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
     }
 
     private fun setupLayout() {
-        val tabLayout = findViewById(R.id.tabLayout) as TabLayout
+        val tabLayout = findViewById<TabLayout>(R.id.tabLayout)
         tabLayout.tabMode = TabLayout.MODE_SCROLLABLE
 
         mPagerAdapter = DynamicPagerAdapter()
@@ -268,10 +268,10 @@ class ScheduleActivity : NavigationDrawerActivity() {
 
     override fun getSelfNavDrawerItem() = NAVDRAWER_ITEM_SCHEDULE
 
-    override fun getSelfToolbar() = findViewById(R.id.toolbar) as Toolbar
+    override fun getSelfToolbar(): Toolbar = findViewById(R.id.toolbar)
 
-    override fun getSelfDrawerLayout() = findViewById(R.id.drawerLayout) as DrawerLayout
+    override fun getSelfDrawerLayout(): DrawerLayout = findViewById(R.id.drawerLayout)
 
-    override fun getSelfNavigationView() = findViewById(R.id.navigationView) as NavigationView
+    override fun getSelfNavigationView(): NavigationView = findViewById(R.id.navigationView)
 
 }
diff --git a/app/src/main/java/co/timetableapp/ui/schedule/ScheduleAdapter.kt b/app/src/main/java/co/timetableapp/ui/schedule/ScheduleAdapter.kt
index 23a162e..a5e49f5 100644
--- a/app/src/main/java/co/timetableapp/ui/schedule/ScheduleAdapter.kt
+++ b/app/src/main/java/co/timetableapp/ui/schedule/ScheduleAdapter.kt
@@ -89,13 +89,13 @@ class ScheduleAdapter(
 
     inner class ScheduleViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-        val colorView = itemView.findViewById(R.id.color)!!
-        val subjectText = itemView.findViewById(R.id.text1) as TextView
-        val detailText = itemView.findViewById(R.id.text2) as TextView
-        val timesText = itemView.findViewById(R.id.text3) as TextView
+        val colorView: View = itemView.findViewById(R.id.color)!!
+        val subjectText: TextView = itemView.findViewById(R.id.text1)
+        val detailText: TextView = itemView.findViewById(R.id.text2)
+        val timesText: TextView = itemView.findViewById(R.id.text3)
 
         init {
-            itemView.findViewById(R.id.text4).visibility = View.GONE
+            itemView.findViewById<TextView>(R.id.text4).visibility = View.GONE
 
             itemView.setOnClickListener { onItemClick?.invoke(it, layoutPosition) }
         }
diff --git a/app/src/main/java/co/timetableapp/ui/settings/SettingsActivity.kt b/app/src/main/java/co/timetableapp/ui/settings/SettingsActivity.kt
index c3d993a..33e5201 100644
--- a/app/src/main/java/co/timetableapp/ui/settings/SettingsActivity.kt
+++ b/app/src/main/java/co/timetableapp/ui/settings/SettingsActivity.kt
@@ -34,7 +34,7 @@ class SettingsActivity : NavigationDrawerActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_settings)
 
-        val toolbar = findViewById(R.id.toolbar) as Toolbar
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
 
         fragmentManager.beginTransaction()
@@ -44,10 +44,10 @@ class SettingsActivity : NavigationDrawerActivity() {
 
     override fun getSelfNavDrawerItem() = NAVDRAWER_ITEM_SETTINGS
 
-    override fun getSelfToolbar() = findViewById(R.id.toolbar) as Toolbar
+    override fun getSelfToolbar(): Toolbar = findViewById(R.id.toolbar)
 
-    override fun getSelfDrawerLayout() = findViewById(R.id.drawerLayout) as DrawerLayout
+    override fun getSelfDrawerLayout(): DrawerLayout = findViewById(R.id.drawerLayout)
 
-    override fun getSelfNavigationView() = findViewById(R.id.navigationView) as NavigationView
+    override fun getSelfNavigationView(): NavigationView = findViewById(R.id.navigationView)
 
 }
diff --git a/app/src/main/java/co/timetableapp/ui/start/InitialSetupActivity.kt b/app/src/main/java/co/timetableapp/ui/start/InitialSetupActivity.kt
index a36b1be..9adf980 100644
--- a/app/src/main/java/co/timetableapp/ui/start/InitialSetupActivity.kt
+++ b/app/src/main/java/co/timetableapp/ui/start/InitialSetupActivity.kt
@@ -20,7 +20,6 @@ import android.annotation.SuppressLint
 import android.app.DatePickerDialog
 import android.content.Intent
 import android.os.Bundle
-import android.support.annotation.IdRes
 import android.support.design.widget.Snackbar
 import android.support.v4.app.Fragment
 import android.support.v4.app.FragmentManager
@@ -49,7 +48,7 @@ import org.threeten.bp.LocalDate
  */
 class InitialSetupActivity : AppCompatActivity() {
 
-    private val mViewPager by lazy { findViewById(R.id.viewPager) as ViewPager }
+    private val mViewPager by lazy { findViewById<ViewPager>(R.id.viewPager) }
 
     private lateinit var mProgressText: TextView
     private lateinit var mPrevButton: Button
@@ -73,16 +72,16 @@ class InitialSetupActivity : AppCompatActivity() {
     private fun setupLayout() {
         mViewPager.adapter = PagerAdapter(supportFragmentManager)
 
-        mProgressText = findViewById(R.id.textView_progress) as TextView
+        mProgressText = findViewById(R.id.textView_progress)
         updateProgressText()
 
-        mPrevButton = findViewById(R.id.button_previous) as Button
+        mPrevButton = findViewById(R.id.button_previous)
         mPrevButton.setOnClickListener {
             changePage(true)
             updateProgressText()
         }
 
-        mNextButton = findViewById(R.id.button_next) as Button
+        mNextButton = findViewById(R.id.button_next)
         mNextButton.setOnClickListener {
             if (mViewPager.currentItem == PagerAdapter.PAGE_END) {
                 saveAndExit()
@@ -314,7 +313,7 @@ class InitialSetupActivity : AppCompatActivity() {
                                   savedInstanceState: Bundle?): View? {
             val rootView = inflater!!.inflate(R.layout.fragment_welcome_timetable, container, false)
 
-            val editText = rootView.findViewById(R.id.editText_name) as EditText
+            val editText = rootView.findViewById<EditText>(R.id.editText_name)
             editText.addTextChangedListener(object : TextWatcher {
 
                 override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int,
@@ -350,7 +349,7 @@ class InitialSetupActivity : AppCompatActivity() {
             // Note -1s and +1s below because Android month values are from 0-11 (to correspond with
             // java.util.Calendar) but LocalDate month values are from 1-12
 
-            val startDateText = rootView.findViewById(R.id.textView_start_date) as TextView
+            val startDateText = rootView.findViewById<TextView>(R.id.textView_start_date)
             startDateText.setOnClickListener {
                 val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, month, dayOfMonth ->
                     val newStartDate = LocalDate.of(year, month + 1, dayOfMonth)
@@ -369,7 +368,7 @@ class InitialSetupActivity : AppCompatActivity() {
                         initialDate.dayOfMonth).show()
             }
 
-            val endDateText = rootView.findViewById(R.id.textView_end_date) as TextView
+            val endDateText = rootView.findViewById<TextView>(R.id.textView_end_date)
             endDateText.setOnClickListener {
                 val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, month, dayOfMonth ->
                     val newEndDate = LocalDate.of(year, month + 1, dayOfMonth)
@@ -408,15 +407,14 @@ class InitialSetupActivity : AppCompatActivity() {
         private fun setupLayout(rootView: View) {
             setupRadioButtons(rootView)
 
-            val checkboxUseNumbers =
-                    rootView.findViewById(R.id.checkbox_sched_use_numbers) as CheckBox
+            val checkboxUseNumbers = rootView.findViewById<CheckBox>(R.id.checkbox_sched_use_numbers)
             checkboxUseNumbers.setOnCheckedChangeListener { _, isChecked ->
                 PrefUtils.setWeekRotationShownWithNumbers(activity, isChecked)
             }
         }
 
         private fun setupRadioButtons(rootView: View) {
-            with(rootView.findViewById(R.id.radio_scheduling_fixed) as RadioButton) {
+            with(rootView.findViewById<RadioButton>(R.id.radio_scheduling_fixed)) {
                 setOnCheckedChangeListener { _, isChecked ->
                     if (isChecked) sTimetableBuilder.weekRotations = 1
                 }
@@ -424,13 +422,13 @@ class InitialSetupActivity : AppCompatActivity() {
                 isChecked = true
             }
 
-            @IdRes val otherRadioIds = arrayOf(
+            val otherRadioIds = arrayOf(
                     R.id.radio_scheduling_2,
                     R.id.radio_scheduling_3,
                     R.id.radio_scheduling_4)
 
             otherRadioIds.forEachIndexed { index, radioId ->
-                (rootView.findViewById(radioId) as RadioButton)
+                rootView.findViewById<RadioButton>(radioId)
                         .setOnCheckedChangeListener { _, isChecked ->
                             if (isChecked) sTimetableBuilder.weekRotations = index + 2
                         }
@@ -447,7 +445,7 @@ class InitialSetupActivity : AppCompatActivity() {
                                   savedInstanceState: Bundle?): View? {
             val rootView = inflater!!.inflate(R.layout.fragment_welcome_subjects, container, false)
 
-            val editText = rootView.findViewById(R.id.editText) as EditText
+            val editText = rootView.findViewById<EditText>(R.id.editText)
             editText.addTextChangedListener(object : TextWatcher {
 
                 override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int,
diff --git a/app/src/main/java/co/timetableapp/ui/start/WelcomeActivity.kt b/app/src/main/java/co/timetableapp/ui/start/WelcomeActivity.kt
index 1522086..5b111c7 100644
--- a/app/src/main/java/co/timetableapp/ui/start/WelcomeActivity.kt
+++ b/app/src/main/java/co/timetableapp/ui/start/WelcomeActivity.kt
@@ -19,6 +19,7 @@ package co.timetableapp.ui.start
 import android.content.Intent
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
+import android.view.View
 import co.timetableapp.R
 import co.timetableapp.TimetableApplication
 import co.timetableapp.data.PortingFragment
@@ -50,11 +51,11 @@ class WelcomeActivity : AppCompatActivity() {
     private fun hasExistingData() = (application as TimetableApplication).currentTimetable != null
 
     private fun setupLayout() {
-        findViewById(R.id.button_import).setOnClickListener {
+        findViewById<View>(R.id.button_import).setOnClickListener {
             startImportFragment()
         }
 
-        findViewById(R.id.button_next).setOnClickListener {
+        findViewById<View>(R.id.button_next).setOnClickListener {
             startActivity(Intent(this, InitialSetupActivity::class.java))
             finish()
         }
diff --git a/app/src/main/java/co/timetableapp/ui/subjects/ColorsAdapter.kt b/app/src/main/java/co/timetableapp/ui/subjects/ColorsAdapter.kt
index 83a5b88..d3362f8 100644
--- a/app/src/main/java/co/timetableapp/ui/subjects/ColorsAdapter.kt
+++ b/app/src/main/java/co/timetableapp/ui/subjects/ColorsAdapter.kt
@@ -55,7 +55,7 @@ class ColorsAdapter(
 
     inner class ColorViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-        val imageView = itemView.findViewById(R.id.imageView) as CircleImageView
+        val imageView: CircleImageView = itemView.findViewById(R.id.imageView)
 
         init {
             itemView.setOnClickListener { onItemClick?.invoke(it, layoutPosition) }
diff --git a/app/src/main/java/co/timetableapp/ui/subjects/SubjectEditActivity.kt b/app/src/main/java/co/timetableapp/ui/subjects/SubjectEditActivity.kt
index aee3ffc..1f384c2 100644
--- a/app/src/main/java/co/timetableapp/ui/subjects/SubjectEditActivity.kt
+++ b/app/src/main/java/co/timetableapp/ui/subjects/SubjectEditActivity.kt
@@ -58,12 +58,12 @@ class SubjectEditActivity : ItemEditActivity<Subject>() {
     }
 
     override fun setupLayout() {
-        mNameEditText = findViewById(R.id.editText_name) as EditText
+        mNameEditText = findViewById(R.id.editText_name)
         if (!mIsNew) {
             mNameEditText.setText(mItem!!.name)
         }
 
-        mAbbreviationEditText = findViewById(R.id.editText_abbreviation) as EditText
+        mAbbreviationEditText = findViewById(R.id.editText_abbreviation)
         if (!mIsNew) {
             mAbbreviationEditText.setText(mItem!!.abbreviation)
         }
@@ -76,7 +76,7 @@ class SubjectEditActivity : ItemEditActivity<Subject>() {
 
         UiUtils.setBarColors(mColor, this, mToolbar!!)
 
-        val imageView = findViewById(R.id.imageView) as ImageView
+        val imageView = findViewById<ImageView>(R.id.imageView)
         imageView.setImageResource(mColor.getPrimaryColorResId(this))
 
         imageView.setOnClickListener {
@@ -101,7 +101,7 @@ class SubjectEditActivity : ItemEditActivity<Subject>() {
             }
 
             val titleView = layoutInflater.inflate(R.layout.dialog_title_with_padding, null)
-            (titleView.findViewById(R.id.title) as TextView).setText(R.string.choose_color)
+            titleView.findViewById<TextView>(R.id.title).setText(R.string.choose_color)
 
             builder.setView(recyclerView)
                     .setCustomTitle(titleView)
diff --git a/app/src/main/java/co/timetableapp/ui/subjects/SubjectsActivity.kt b/app/src/main/java/co/timetableapp/ui/subjects/SubjectsActivity.kt
index 2880875..2326a01 100644
--- a/app/src/main/java/co/timetableapp/ui/subjects/SubjectsActivity.kt
+++ b/app/src/main/java/co/timetableapp/ui/subjects/SubjectsActivity.kt
@@ -47,16 +47,16 @@ class SubjectsActivity : NavigationDrawerActivity() {
     }
 
     private fun setupToolbar() {
-        val toolbar = findViewById(R.id.toolbar) as Toolbar
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
     }
 
     override fun getSelfNavDrawerItem() = NAVDRAWER_ITEM_SUBJECTS
 
-    override fun getSelfToolbar() = findViewById(R.id.toolbar) as Toolbar
+    override fun getSelfToolbar(): Toolbar = findViewById(R.id.toolbar)
 
-    override fun getSelfDrawerLayout() = findViewById(R.id.drawerLayout) as DrawerLayout
+    override fun getSelfDrawerLayout(): DrawerLayout = findViewById(R.id.drawerLayout)
 
-    override fun getSelfNavigationView() = findViewById(R.id.navigationView) as NavigationView
+    override fun getSelfNavigationView(): NavigationView = findViewById(R.id.navigationView)
 
 }
diff --git a/app/src/main/java/co/timetableapp/ui/subjects/SubjectsAdapter.kt b/app/src/main/java/co/timetableapp/ui/subjects/SubjectsAdapter.kt
index 10f286c..9bc8c76 100644
--- a/app/src/main/java/co/timetableapp/ui/subjects/SubjectsAdapter.kt
+++ b/app/src/main/java/co/timetableapp/ui/subjects/SubjectsAdapter.kt
@@ -63,8 +63,8 @@ class SubjectsAdapter(
 
     inner class SubjectViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-        val colorView = itemView.findViewById(R.id.color)!!
-        val nameText = itemView.findViewById(R.id.name) as TextView
+        val colorView: View = itemView.findViewById(R.id.color)
+        val nameText: TextView = itemView.findViewById(R.id.name)
 
         init {
             itemView.setOnClickListener { onItemClick?.invoke(it, layoutPosition) }
diff --git a/app/src/main/java/co/timetableapp/ui/subjects/SubjectsFragment.kt b/app/src/main/java/co/timetableapp/ui/subjects/SubjectsFragment.kt
index 72b0bfb..2dca9c8 100644
--- a/app/src/main/java/co/timetableapp/ui/subjects/SubjectsFragment.kt
+++ b/app/src/main/java/co/timetableapp/ui/subjects/SubjectsFragment.kt
@@ -19,6 +19,7 @@ package co.timetableapp.ui.subjects
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import android.support.design.widget.FloatingActionButton
 import android.support.v4.app.ActivityOptionsCompat
 import android.support.v7.widget.RecyclerView
 import co.timetableapp.R
@@ -49,7 +50,7 @@ class SubjectsFragment : ItemListFragment<Subject>() {
     }
 
     private fun setupFab() {
-        activity.findViewById(R.id.fab).setOnClickListener {
+        activity.findViewById<FloatingActionButton>(R.id.fab).setOnClickListener {
             val intent = Intent(activity, SubjectEditActivity::class.java)
             startActivityForResult(intent, REQUEST_CODE_SUBJECT_DETAIL)
         }
diff --git a/app/src/main/java/co/timetableapp/ui/timetables/TermsAdapter.kt b/app/src/main/java/co/timetableapp/ui/timetables/TermsAdapter.kt
index d64f402..97331f4 100644
--- a/app/src/main/java/co/timetableapp/ui/timetables/TermsAdapter.kt
+++ b/app/src/main/java/co/timetableapp/ui/timetables/TermsAdapter.kt
@@ -61,8 +61,8 @@ class TermsAdapter(
 
     inner class TermViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-        val nameText = itemView.findViewById(R.id.time) as TextView
-        val detailText = itemView.findViewById(R.id.day) as TextView
+        val nameText: TextView = itemView.findViewById(R.id.time)
+        val detailText: TextView = itemView.findViewById(R.id.day)
 
         init {
             itemView.setOnClickListener { onItemClick?.invoke(it, layoutPosition) }
diff --git a/app/src/main/java/co/timetableapp/ui/timetables/TimetableEditActivity.kt b/app/src/main/java/co/timetableapp/ui/timetables/TimetableEditActivity.kt
index e767b1f..dba6cc3 100644
--- a/app/src/main/java/co/timetableapp/ui/timetables/TimetableEditActivity.kt
+++ b/app/src/main/java/co/timetableapp/ui/timetables/TimetableEditActivity.kt
@@ -95,15 +95,15 @@ class TimetableEditActivity : ItemEditActivity<Timetable>(), LabelledSpinner.OnI
     }
 
     override fun setupLayout() {
-        mNameEditText = findViewById(R.id.editText_name) as EditText
+        mNameEditText = findViewById(R.id.editText_name)
         if (!mIsNew) {
             mNameEditText.setText(mItem!!.name)
         }
 
         setupDateTexts()
 
-        mSchedulingSpinner = findViewById(R.id.spinner_scheduling_type) as LabelledSpinner
-        mWeekRotationSpinner = findViewById(R.id.spinner_scheduling_detail) as LabelledSpinner
+        mSchedulingSpinner = findViewById(R.id.spinner_scheduling_type)
+        mWeekRotationSpinner = findViewById(R.id.spinner_scheduling_detail)
 
         mSchedulingSpinner.onItemChosenListener = this
         mWeekRotationSpinner.onItemChosenListener = this
@@ -117,8 +117,8 @@ class TimetableEditActivity : ItemEditActivity<Timetable>(), LabelledSpinner.OnI
     }
 
     private fun setupDateTexts() {
-        mStartDateText = findViewById(R.id.textView_start_date) as TextView
-        mEndDateText = findViewById(R.id.textView_end_date) as TextView
+        mStartDateText = findViewById(R.id.textView_start_date)
+        mEndDateText = findViewById(R.id.textView_end_date)
 
         if (!mIsNew) {
             mStartDate = mItem!!.startDate
@@ -208,7 +208,7 @@ class TimetableEditActivity : ItemEditActivity<Timetable>(), LabelledSpinner.OnI
             ActivityCompat.startActivityForResult(this, intent, REQUEST_CODE_TERM_EDIT, bundle)
         }
 
-        val recyclerView = findViewById(R.id.recyclerView) as RecyclerView
+        val recyclerView = findViewById<RecyclerView>(R.id.recyclerView)
         with(recyclerView) {
             setHasFixedSize(true)
             layoutManager = object : LinearLayoutManager(this@TimetableEditActivity) {
@@ -219,7 +219,7 @@ class TimetableEditActivity : ItemEditActivity<Timetable>(), LabelledSpinner.OnI
     }
 
     private fun setupAddTermButton() {
-        val btnAddTerm = findViewById(R.id.button_add_term) as Button
+        val btnAddTerm = findViewById<Button>(R.id.button_add_term)
         btnAddTerm.setOnClickListener { view ->
             val intent = Intent(this, TermEditActivity::class.java)
             intent.putExtra(TermEditActivity.EXTRA_TIMETABLE_ID, findTimetableId())
diff --git a/app/src/main/java/co/timetableapp/ui/timetables/TimetablesActivity.kt b/app/src/main/java/co/timetableapp/ui/timetables/TimetablesActivity.kt
index b6bfcf5..fe98cf9 100644
--- a/app/src/main/java/co/timetableapp/ui/timetables/TimetablesActivity.kt
+++ b/app/src/main/java/co/timetableapp/ui/timetables/TimetablesActivity.kt
@@ -50,16 +50,16 @@ class TimetablesActivity : NavigationDrawerActivity() {
     }
 
     private fun setupToolbar() {
-        val toolbar = findViewById(R.id.toolbar) as Toolbar
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
     }
 
     override fun getSelfNavDrawerItem() = NAVDRAWER_ITEM_MANAGE_TIMETABLES
 
-    override fun getSelfToolbar() = findViewById(R.id.toolbar) as Toolbar
+    override fun getSelfToolbar(): Toolbar = findViewById(R.id.toolbar)
 
-    override fun getSelfDrawerLayout() = findViewById(R.id.drawerLayout) as DrawerLayout
+    override fun getSelfDrawerLayout(): DrawerLayout = findViewById(R.id.drawerLayout)
 
-    override fun getSelfNavigationView() = findViewById(R.id.navigationView) as NavigationView
+    override fun getSelfNavigationView(): NavigationView = findViewById(R.id.navigationView)
 
 }
diff --git a/app/src/main/java/co/timetableapp/ui/timetables/TimetablesAdapter.kt b/app/src/main/java/co/timetableapp/ui/timetables/TimetablesAdapter.kt
index 68be7c1..d80fbc3 100644
--- a/app/src/main/java/co/timetableapp/ui/timetables/TimetablesAdapter.kt
+++ b/app/src/main/java/co/timetableapp/ui/timetables/TimetablesAdapter.kt
@@ -80,9 +80,9 @@ class TimetablesAdapter(
 
     inner class TimetableViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-        val radioButton = itemView.findViewById(R.id.radioButton) as RadioButton
-        val nameText = itemView.findViewById(R.id.name) as TextView
-        val detailText = itemView.findViewById(R.id.details) as TextView
+        val radioButton: RadioButton = itemView.findViewById(R.id.radioButton)
+        val nameText: TextView = itemView.findViewById(R.id.name)
+        val detailText: TextView = itemView.findViewById(R.id.details)
 
         init {
             itemView.setOnClickListener { onItemClick?.invoke(it, layoutPosition) }
diff --git a/app/src/main/java/co/timetableapp/ui/timetables/TimetablesFragment.kt b/app/src/main/java/co/timetableapp/ui/timetables/TimetablesFragment.kt
index 74c0bd6..64b8d97 100644
--- a/app/src/main/java/co/timetableapp/ui/timetables/TimetablesFragment.kt
+++ b/app/src/main/java/co/timetableapp/ui/timetables/TimetablesFragment.kt
@@ -19,6 +19,7 @@ package co.timetableapp.ui.timetables
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import android.support.design.widget.FloatingActionButton
 import android.support.design.widget.Snackbar
 import android.support.v4.app.ActivityOptionsCompat
 import android.support.v4.app.Fragment
@@ -75,7 +76,7 @@ class TimetablesFragment : Fragment() {
     private fun setupLayout() {
         setupList()
 
-        activity.findViewById(R.id.fab).setOnClickListener {
+        activity.findViewById<FloatingActionButton>(R.id.fab).setOnClickListener {
             val intent = Intent(activity, TimetableEditActivity::class.java)
             startActivityForResult(intent, REQUEST_CODE_TIMETABLE_EDIT)
         }
@@ -106,7 +107,7 @@ class TimetablesFragment : Fragment() {
             startActivityForResult(intent, REQUEST_CODE_TIMETABLE_EDIT, bundle)
         }
 
-        val recyclerView = mRootView.findViewById(R.id.recyclerView) as RecyclerView
+        val recyclerView = mRootView.findViewById<RecyclerView>(R.id.recyclerView)
         with(recyclerView) {
             val linearLayoutManager = LinearLayoutManager(activity)
             layoutManager = linearLayoutManager
diff --git a/app/src/main/java/co/timetableapp/util/UiUtils.kt b/app/src/main/java/co/timetableapp/util/UiUtils.kt
index 2b94f8d..4d9a276 100644
--- a/app/src/main/java/co/timetableapp/util/UiUtils.kt
+++ b/app/src/main/java/co/timetableapp/util/UiUtils.kt
@@ -88,21 +88,21 @@ object UiUtils {
                             @StringRes subtitleRes: Int? = null): View {
         val placeholderView = LayoutInflater.from(context).inflate(R.layout.placeholder, null)
 
-        val background = placeholderView.findViewById(R.id.background)
+        val background = placeholderView.findViewById<View>(R.id.background)
         background.setBackgroundColor(ContextCompat.getColor(context, backgroundColorRes))
 
-        val image = placeholderView.findViewById(R.id.imageView) as ImageView
+        val image = placeholderView.findViewById<ImageView>(R.id.imageView)
         image.setImageDrawable(tintDrawable(context, drawableRes, drawableColorRes))
         if (largeIcon) {
             image.layoutParams.width = dpToPixels(context, 108)
             image.layoutParams.height = dpToPixels(context, 108)
         }
 
-        val title = placeholderView.findViewById(R.id.title) as TextView
+        val title = placeholderView.findViewById<TextView>(R.id.title)
         title.setText(titleRes)
         title.setTextColor(ContextCompat.getColor(context, textColorRes))
 
-        val subtitle = placeholderView.findViewById(R.id.subtitle) as TextView
+        val subtitle = placeholderView.findViewById<TextView>(R.id.subtitle)
         if (subtitleRes == null) {
             subtitle.visibility = View.GONE
         } else {
diff --git a/build.gradle b/build.gradle
index 5a29c71..10ad382 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@
 
 buildscript {
     ext {
-        android_support_lib_version = '25.4.0'
+        android_support_lib_version = '26.0.0-beta2'
         kotlin_version = '1.1.3-2'
     }