Cleanup, add apps page