Structured elements into Linear Layout and minor changes to text field.