Layout improvements suggested by Olexiy.