committing before flat ui changes
Updates for flat ui