Added john's layout adjustments