Minor layout fixes