UI reworked

UI redone