more Flip UI addition and changes