[wip] Improved GUI