Layout, size, and scale fixes