Updated Flat UI