Ui cleanup

Started cleaning up the UI, reducing repetition. Work in progress, **don't merge quite yet**