App is now quite enjoyable