Fix underlined links and input spacing
Merge remote-tracking branch 'upstream/master'