Major changes

Now buttons call new windows