Improved display of tags and reduced a lot of unnexessary code.