UI rework
fixed merge conflicts