I added the classes you suggested, but also merged a few(if that's okay).

Also, in the IC, it's lunchtime. :)