Revamp of bootstrap