reworked the UI