Add flat ui
Fix merge