Layout fixes Wall off