New ui elements
fixed the last part of the ui.