Reworked ui