Add submit on enter & general cleanup/consistency
Merge remote-tracking branch 'origin/master'