Attempts to fix broken markup after refactor