Updated markup to follow bootstrap 3