Refactor

Update the UI