Fixing inconsequential layout bugs
Merge commit '60c627e'