WIP - Refactor UI for better request & initial auth integration