Refactor user cabinet