Set default layout and size
Merge remote-tracking branch 'origin/ChrisBranch' into EthanBranch

Conflicts:
	frame.py