Fix small bugs with layout.
Merge branch 'refs/heads/github.master' into github.permissions