UI in a happy place

Yay
fix merge conflicts