Fixing layouts

Alignment issues resolved.