Added Header support and made a couple UI enhancements