Layout merged

I dunno if Eddy was not interested in 'cause I didn't furnish the pull request with the issue and he thought it would add work to you. Anyway, here it is ;)