Add bootstrap, fix blank number issues and several other things