App delegate
Fix UI Issue