Reconciling with master, not finished with layout
Sync and repaired master with minor CSS adjustments
Merging with master
Merge branch 'master' into filling-in-layout