Added header and refined UI