Further Updates
Merge remote-tracking branch 'master/master'
Gives focus to first text field on load