Minor layout and code fixes