updated master UI

merged my UI changes into the main UI