[WIP] Improved ui

Working on a better UI.