Moving some layouts around.
Merging changes