Rewrote a couple of components using CoffeeScript