UI cleanup & changes. Added placeholder FAQ.
Merge remote-tracking branch 'origin/master'