some bugs fixed
bootstrap upgraded to v3