Updated app skeleton fixing couple wrong methods