Continued modifications to app