Changed a few styles, prepping to upgrade to ember rc2