Improve layout for anzlic editor
Merge remote-tracking branch 'upstream/master'