Fixed visibility issues, no longer displays irrelevant data'