Renamed bootstrap blocks
typedef fix
Merge branch 'bootstrap-progress'