prepare for update functionality, UI tweaks