More layout and text changes
Work in progress