ui cleanup and some reworking to make the app more responseve