Cleaning up code, using Bootstrap 3, and add google map