added initial amber UI changes