Updates to implement twitter-Bootstrap 3