Made some minor changes to MainActivity