reworked ui again