General layout tweaks
Introduced Rev D changes