Work on UI
Refactor authorization