Layout tweaks
Consistency: add many missing ;
Merge remote-tracking branch 'cactid/bootstrap3'