Chnages to some elements, some UI work.