Minor layout adjusts