Layout updates: no backstretch, no more excessive whitespace, etc