UI refactorization to include drive section