#1063 updated to bootstrap3