finalizing UI changes
fix merge, finalized UI