Added new windows and edited database