Basic cleanup.
Repositioned usb icon and basic cleanup.