Minor changes, mostly to remove warnings in Java 1.7
Improve sizing of windows