Added checks to each input to only display variables if they've been set