Major layout fixes; seems to work fine...everywhere, now.