ui updates
fixed merge conflicts