Minor layout and display fixes