refactored to introduce bootstrap
changed some css