SONATA-105 - Improved twitter bootstrap integration and minor semantical
optimizations