enhanced logic in app and mode page