Fixed bad carriage returns
Merged from master
Improved setting style and made login adjust to keyboard