Comments disabling and UI fixes.