Basic work on tags front end
Clean up