UI Update

Main Window Updated

sort and removed unused using's