#39, #351 - More work on vitals form and app