Upgrade to Bootstrap 3
Progress on bootstrap 3