Converted convoluted helper into view partial
Convert another helper into a simpler view partial
Don't show null in user interface