More style adjustments and a bit of change on the hmtl structure