fixed and finalized bootstrap feature