Adjust layouts a bit