Fixed layouts issues.

Proper alignment