Merge "App Handle education UI" into main