Few improvements, better html