master: Fixed layout