added some bootstrap css prettiness
Merge remote-tracking branch 'upstream/master'