Adding twitter boostrap and some refactoring