Updated to Flat UI