Moving design stuff to DesignBundle