Added new windows and fixed a few bugs