DiC & Improved rendering & bootstrapped css
Merge remote-tracking branch 'origin/master'