Testing Fix

Controller and view fix