refactored UI
updated deps