Layout fixes after merge