update merged problem controller fixes and views