Some layout fixes and wording changes