Increased window size + minor adjustments