Adding tag functionality plus some tweaks to looks better in phone