Refactoring; updates deps; minor changes to UI