Changed to use no-focus class