Fixing layouts for size and orientation

Fixing layouts for size and orientation