Layout changes

Continue upgrade of Bootstrap & Font Awesome.