Improving the speed UI
Drying up some code