migrated to bootstrap
fixed notes display
Merge branch 'bootstrap'