Added Discomfort view controller and some minor fixes