merged html and css. Added database entry info