Added more graceful scaling with window sizes