finalised flat-ui integration
finalised flat ui integration