MBS layout edits