Major Bootstrap3 update from Bas' project