Ui consolidation

UI looks way cooler now!