Fix rendering and intercept input