Added default values and improved close tag UX