Added checks to only display values if they've been set