Add boostrap
Production improvements