changed tabs to spaces, but mostly fixed the mainActivity. models are
still buggy