reworked ui
reworked ui