Finish adapting boostrap 3