completely new version 2 with bootstrap