Updated Front end. Looks more professional and no more tags/buttons lingering
Resolved merge conflicts