Feature bootstrap 3

+ Some changes and addition