Various text and button changes to layout