Reworked user interface