A few changes before converting mainActivity