Some layout fixes and updates