Continued devel on app overhaul