UserControl Refactoring

ready to implement drive detection