Fixed errors + MainActivity