Things modified to work with latest bootstrap