app_builder improvements