Fixed project & added window controllers