Visual and functional tag improvements

Added new, clearer container for tag area and improved logic for where
it appears