combine ui changes and my changes