fixes for fields flat ui