Fixes for constraints, updated default window size