Improved grammar view and its Angular controller