Fixed some bugs in Paw layout.