Couple of layout fixes, and spelling