Added stuff in Window
Added Controller class