GUI changes & moving and some changes in other classes

GUI changes & moving and some changes in other classes