more ui additions
fixed merge conflicts hopefully