Updates to layout; changes to text