Tightening frame size restrictions

Closes #611