Added styling and better add functionality