Typing status changes
Woops
Fiddle with layout
Set text fields blank again
Fixed spacing
Merge branch 'ollieh-master'