Applied test-wise the flat ui style
More flat ui